Merge "Merge "Protect against weak pointer crash." into oc-mr1-dev am: 0480580696" into oc-mr1-dev-plus-aosp
am: 67d205c3ab

Change-Id: I7989438ced94e356ed355461d03192ef668cd9a8