Merge changes I0ca13626,I3677ce54 into nyc-dev am: b99e19c729
am: 1c5baaaa8e

Change-Id: I41aa2811cf111fa7b880e3e574bcacc059b26fac