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

Change-Id: I8ca4c9841d0067564c951fa7552f99207bfcd597