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

Change-Id: I8b7b4a60aa3f56ae0931b8b8edffd3913a638f3a