Merge \\\\\\\\\\"Don\\\\\\\\\\'t use sp<>&\\\\\\\\\\" into klp-dev am: 598f8d3218 am: 0ee3710873 am: e66381758d  -s ours am: 33e914c861 am: 803ae13af2 am: 63ef91ddeb am: edf89fa6b7 am: 925932d850 am: 000043200f
am: 3de92e214e

Change-Id: I883cb6ec5a100ec234c44a9a45f9e8fb925d9b63