Reconcile with jb-mr2-release - do not merge

Change-Id: I6f4f70c6f405f6f6703c2a063475714ad48462d7