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

Change-Id: I3d002df3a23b26c18e3b3507fbcec69d58a69140