Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev am: 05d36569b6
am: 58b3f35e9f

Change-Id: I31100e69ff88052daf387adf9063abdaa1ce4db2