Merge changes I0ca13626,I3677ce54 into nyc-dev am: bbcb733d80
am: 20367dbd3b

Change-Id: Id8cafbb4ee743d604626af882fe25f5a09296a2b