Reconcile with jb-mr1-release - do not merge

Change-Id: I732a30dbf2d94690e316a066e5b8d6fa19a190bb