Reconcile with jb-mr1-release - do not merge

Change-Id: Idf71be6e72f974579d6b5fe382f7fe4afd56c7cc