Merge changes I1489eaf6,I8ee8f978 into nyc-dev
am: 575add3bcf

Change-Id: Ife706192b6acf1bf2d76b5c0f866ae7d417027d7