Reconcile with jb-mr1-release - do not merge

Change-Id: I65271947f0e7aef323f59617db1bb1a6744bf31e