Reconcile with jb-release

Change-Id: Ib508cbb004388631b20650d575b2829b481fb989