Merge "Don't use sp<>&" into lmp-mr1-ub-dev