Merge "Merge "[Companion] Fix NPE in associate" into oc-dev am: ba003a97f8 am: 5cb26b76ff" into oc-dr1-dev-plus-aosp