Reconcile with jb-release

Change-Id: Ica9e5255d9ea862cb24ef52d69545881147a2a26