Reconcile with jb-mr1-release

Change-Id: Ic77b4af66a8f52cac75543d400904a37cbd0d020