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

Change-Id: If04492a7177ba17616a4dfdc52ba8a1a3d5d5951