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: dd1a44f3 am: c0987d91 am: e7e8e4fd
Change-Id: I7315bcb5571349e2b881114725f3e35911426d57