Reconcile with jb-mr1-release - do not merge

Change-Id: I16f4f8bce73e662e78078661599c8b3080db7cfe