Merge "Check sp<>::clear() for data races" am: 59cd823752 am: 39ca279282
am: a6809b060e

Change-Id: Ibca4bcbdd438e2f90ba0fdc55a5950f0d046ff94