Reconcile with jb-mr1-release - do not merge

Change-Id: I090c4533cd67bd4fb1c98cd2d950a70ac85b7e85