Reconcile with jb-mr1-release - do not merge

Change-Id: Ia4a5f2b89b6eaab5ccd375f65c839ad6c5c7c800