Merge \\\"Don\\\'t use sp<>&\\\" into klp-dev am: 598f8d3218 am: 0ee3710873
am: e66381758d  -s ours

Change-Id: Ie7422768422714cd1c88d2c9c52d7d682157bb4a