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

Change-Id: I0c6fd4c96a2f38dd895fcaa223c4c33ea2c5e32a