Merge \\\"Fix permissions update for VrListenerService on user changes.\\\"...
Merge \\\"Fix permissions update for VrListenerService on user changes.\\\" into nyc-dev am: d054f4f2 am: 3224aa75
am: 3505a884
Change-Id: I548365e861a938fad3b8d28ca2d6f0f6a8b1f367