Reconcile with jb-mr1-release - do not merge

Change-Id: I0800e6996dad4753a984e5b3bb2c791f12e7ddf7