Merge "Add check to sp<> raw pointer constructor"
am: c532941e54

Change-Id: I10e6b0bc269709e19665f9bd2d5c0b0b2622700d