Reconcile with jb-mr1-release - do not merge

Change-Id: I865e554d84e2c86debcfe02cbc31bf4b138b4264