Reconcile with jb-mr1-release - do not merge

Change-Id: I561bcbb1b33f19d08e9c9b316e132f4314116e5f