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

Change-Id: I3687a40b48fbf699f45a0ddd4997be1dc8fc8fc6