Reconcile with jb-release

Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec