Reconcile with jb-mr1-release

Change-Id: I0bcb119c5fb91ed58b58d266c1c7a77c51c2c3b9