Merge \\\"Don\\\'t use sp<>&\\\" into lmp-mr1-ub-dev am: 277a8ab9ab am: 4905ff3baf
am: 1f56e8a581

Change-Id: Ic730a208bfab0576dfbd92106f3202bbb99554f3