Reconcile with jb-release

Change-Id: I7e58aa4eefafa172c5fae884edf6257f13c64b73