Merge "DO NOT MERGE: More tests for CurrentUserContextTracker" into rvc-dev...
Merge "DO NOT MERGE: More tests for CurrentUserContextTracker" into rvc-dev am: aeb6fd2c am: 593cb286 am: 5fb6cd8b am: 3c9b1dcc
Change-Id: If4f5e4d2c7e704438f07f82ab231f73dba4bfd0d