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

Change-Id: I09bbd93408e2de8b4ce159a7b22d3650a04ba081