Reconcile with jb-mr1-release - do not merge

Change-Id: Icad86b92debd9605c745283aeffc3f459a3549ce