Reconcile with jb-mr1-release - do not merge

Change-Id: I53a9779340308558b371b239dfe4048b9c8bb6fc