Merge changes Ifeba21da,Ie7982790,I02bb34b7 into nyc-dev am: 2ee735c97c
am: 71eb4da795

* commit '71eb4da795076dd89e95969d934e00eef78940ee':

Change-Id: Id761df65c2a7f8c831e637b9f00cb6a5068e371c