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

Change-Id: I2efed3ec7096c23bc486d44b5303e24716b31fb7