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

Change-Id: I25294fc199e7242dbb2a9700303e713734bbb37d