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

Change-Id: Ib0e36940d360fbd3e883af3ac2f4c682ad73b684