Reconcile with jb-release

Change-Id: I487813624accf824b997001a2d88930b916f1a7b