Merge changes I761c90cd,I0e2dd0af into nyc-dev
am: cb4af5774a

Change-Id: If8a397d3d3bfdf5bb6787aa76c1fb1b0fadfcd9d