Reconcile with jb-release

Change-Id: I13d87741db3984d51ba9b2ec52b305e8d2c0a665