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

Change-Id: I7d7faa17db64be9f01735e2fe0ec216a689042d1