Reconcile with jb-release

Change-Id: If5e9f5aa8262e5063c29d4340a95f8b83bb444ea