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

Change-Id: I7b9e67e87349a4646ab25a413e018dc98b53f3f2