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

Change-Id: Ie3c2e7154357a51b4947c807347650456297d81d