Reconcile with jb-release

Change-Id: Iab5346490b6838a2137ffd28e72e4f8d4e9f48da