Reconcile with jb-mr1.1-release - do not merge

Change-Id: I7915c2abffbc99177c1fec8cf47dfd5c43d88d20