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

Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00