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

Change-Id: Ia8ba85cf0bde2f32afb7f6704e4653c6c0e907ed