Merge changes Idb555b01,If8acf31b into nyc-dev am: 831ecc8
am: c880a80

* commit 'c880a803d1e075a4063c3f7b37a4e50c121a09e7':

Change-Id: I41a3f61fe8ca25cce0e39c4bda27e18e6af51266