Reconcile with jb-mr1-release - do not merge

Change-Id: I310560c329cb0d8aeb664c67ea6e67e006809637