Revert "Manually merge commit 'd3d4725f08ac2f27368cda123e87751231c9bd14' into nyc-dev"
am: d9006caf57

Change-Id: I33126a859f4cf14227f743b74fd965b3a0737e9b