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

Change-Id: I540bf405007052af240d58a4e390cbbbda9011e8