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

Change-Id: I95ce93c3c1975b444bd6cd2c49a3b215395d2754