Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
am: f4de8dd77c

Change-Id: I439643be2fd5699f1a98d8ca15d14167ea3ffde1