Reconcile with jb-mr2-release - do not merge

Change-Id: I9c2c56c767d1ba2873e7eddbb4fe14793bdb8ae8