Merge "Move companion device check to the handler" into oc-dev am: 077b1ea14d
am: f1c14812e9

Change-Id: Id74e51010a49907d814e2b32c2138329ecd03ac0