Merge \\\"Don\\\'t use sp<>&\\\" into nyc-dev am: 09b5fd9cbf am: 88b6c4d3d8
am: bd9895f125

Change-Id: Ia537d480e843ec1f6f4d513ad2c1fed0ff2f7e58