Reconcile with jb-release

Change-Id: I71f037e68eda652f71ce7a15e4afff031adbd913