Reconcile with jb-release

Change-Id: Ibcbaa0404cf8088a9941cc1238f86abfaf73edf1