Reconcile with jb-mr0-release - do not merge

Change-Id: I1e3c8a0ea72c31ae91cdbd6453c32d8c6901a29a