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

Change-Id: I67bac3501905ca69180bf187bf53a4a0e7581ee8