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