Reconcile with jb-mr1-release - do not merge

Change-Id: Idf52e01ae31e4f8665ff945fc53943906611e62e