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

Change-Id: Ic96d6116ceff0cadf0355d8ecead30b4744053c8