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

Change-Id: I046a6fd53782e965e39a5a43ab0ea151794a1aeb