Reconcile with jb-release

Change-Id: I29b911c1fc6bc4b82c30cd9a1324cdd22e4f2dc6