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

Change-Id: I5b17d81b636ce0356539fba4a4bb51a65f97ca9c