Reconcile with jb-release

Change-Id: Ifc574ebc9a62e9f0b6dd48d93866b0d044503bfc