Reconcile with jb-release

Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24