Reconcile with jb-mr1-release - do not merge

Change-Id: I053fb3350a4b391b9d9ae497ed514a65a26cb002