Reconcile with jb-release

Change-Id: I76ffcc7449cf140d5598612a6be3e8f7b964dc9b