Reconcile with jb-mr1-release - do not merge

Change-Id: I7ec0e7696f2f2004f75d5b83f86ea6d890e0cd3d