Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev
am: fbe2eedb28

Change-Id: I5ba3ae957001974e33d6d6f49d542c05b9c13aba