address PR comments
address PR comments

Signed-off-by: Donny Yung <a3c95fdeaab43728a52e63c7d3f3baf10c1cf37d@datawire.io>
(cherry picked from commit bbea5aa2f6e93ced6d728bfc84da81e42607a9bd)

datawire/telepresence,datawire/telepresence,datawire/telepresence