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

Change-Id: I3e8c5deed8589c1778a1e09e975d2f8ef038b627