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

Change-Id: If4a59c7fe516e8456aefda12fb2292c3b3af93da