Reconcile with jb-mr1-release

Change-Id: I9132cf02a61b153013bd0c7e8d2a5e9dd3161ca4