Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am: efa21a9924
am: 70d32b3d22

Change-Id: I7b235a555e585900e7949f79757d7555e277270d