Reconcile with jb-mr1-release - do not merge

Change-Id: I706e132c92cf35fa435b8d4d0d7778d0452d081a