Reconcile with jb-mr0-release - do not merge

Change-Id: I5fffe5e9074ea03b0b9b31cde72dc4d6676f730a