Merge "Expose Companion API via shell command" into oc-dev am: 60c17e06e8
am: 0b035e657d

Change-Id: Idbff58ecfc8b65f8c6cfcef068f1c91c33c0ff4a