Reconcile with jb-mr1-release - do not merge

Change-Id: I2c8f0cf7f655c624f2c72ed967dba6b071e8fe6e