Merge "Call updateChooserCounts with the correct user id" into rvc-dev am:...
Merge "Call updateChooserCounts with the correct user id" into rvc-dev am: dbbb59a1 am: 7d14d57b am: 357031d6 am: 1975717b
Change-Id: Ia99fccc02eff585bf194d7b077191a16ae15bcfb