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
am: 62d41626f0

Change-Id: I50c5e3b2fc8c6639ff55548922d48a25dd57be80