Reconcile with jb-mr1-release - do not merge

Change-Id: Iae77154c6944fa7a6bde1087a6823ef4fcae009c