Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f  -s ours am: 9f775619f8
am: 987c7c6bc9

Change-Id: I30a1125b3ba9ce0fe35aa51685ed7484538009b2