Merge changes I1379b959,Iaf1e1bff into nyc-dev am: 2b8771c79b
am: 1e781eebc8

* commit '1e781eebc8163071cf0ade0fec9cf72e57834bea':

Change-Id: Ic29c680e6bc407e9f5253d3dacfc86bc793a85fe