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

Change-Id: Id86e6703dfc57705b361adf66da9f852498b32ea