Reconcile with jb-release

Change-Id: I0169265c6372e5edd9d49f6ad14bfec3ebeda9c0