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

Change-Id: Ib65cfee5e317b03ce57dc4cc695241dc62aaf282