Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6
am: aed422e05b

Change-Id: Ifd6a64c599d045735f0c85595315679887310f18