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