Reconcile with jb-release

Change-Id: Idef831103e3ee313ae771483241391f90f5feafb