Reconcile with jb-release

Change-Id: Idddf82739bdf873cc163171dd5469f017f7d07a6