Reconcile with jb-release

Change-Id: I1f173833b337368c87084eccddb4d9b7d46294fd