Merge changes Idd0b38b4,I511356a8 into nyc-mr1-dev
am: 0ff47b64cd

Change-Id: I6a7e46b4c10ecce4cd038aa90ec4536fed61d3ae