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

Change-Id: Id7d97cc1d2d909a25fe4ad9d883ddba8f0b81746