Merge \\"Fix permissions update for VrListenerService on user changes.\\" into nyc-dev am: d054f4f2fe
am: 3224aa7505

Change-Id: I2e189f09f28a3b64c37da44caeb96af095cc1709