Reconcile with jb-mr0-release - do not merge

Change-Id: I21582e8cedf809f04f7d04d9af5a34c21ea77f41