Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
am: 9e419d3082

Change-Id: I0aa741d69e2f579a914973aff6a093a19d9097b4