Merge \\\"Fix permissions update for VrListenerService on user changes.\\\"...
Merge \\\"Fix permissions update for VrListenerService on user changes.\\\" into nyc-dev am: d054f4f2 am: 5d411eb8
am: 5bc07c99
Change-Id: Idd54b559077e5cbab6376392f0358171f312f379