Merge "[Companion] Fix NPE in associate" into oc-dev
am: ba003a97f8

Change-Id: I690b6d88bcce507d7fbae855cd9939616ac86212