Reconcile with jb-mr2-release - do not merge

Change-Id: I5a911c726db73fdb606d929fbd9bc83aa36c5c6c