Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca
am: 8e03a859cc

* commit '8e03a859cca66c91fad5395ba2ebb795a293c112':

Change-Id: I3bc38757938aa34e9cb8f89fc8e34b27b52368a8