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

Change-Id: Id2e6fc9f6a85ff1d17fd6225291858b5012dda32