Reconcile with jb-mr1-release - do not merge

Change-Id: I807fafdf3e52abcd291f3f8e593c92f8016ad2ef