Reconcile with jb-release

Change-Id: I55842c8ce980d1a5ea7bb4dcb3eb7d8dd4c9dbac