Reconcile with jb-mr1-release - do not merge

Change-Id: I3f51f6d0028015c72222250ba7521bbb169f4f7c