Reconcile with jb-mr1-release - do not merge

Change-Id: I6aeeecadf25294eb804a03b572cace327c6709e1