Merge changes I069e2b7e,Ic5e9e58a into nyc-dev am: f4de8dd77c am: 932fe93df7
am: 177e977c09

Change-Id: I36e1607de9b10982a8366d9d30e2e51e42f383e4