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

Change-Id: If26c7cf5ce09bc4d92033dbc1ad3b400854a22b3