Reconcile with jb-mr1-release - do not merge

Change-Id: I595f70b0e854d3a42bf2c5121bc6f175a83ab9a2