Reconcile with jb-mr1-release - do not merge

Change-Id: If93b4dbbf4cb52b6640d20e1213b6619492b0545