Reconcile with jb-release

Change-Id: Ibb735de39e6d7a0452b9f04145121ee7154d9b99