Reconcile with jb-mr1-release - do not merge

Change-Id: I290ad0de0601dc3c49366d7b9d44d9d30021559d