Merge "Fix a calling loop for getAllUsers." into pi-dev
am: e02f32b921

Change-Id: I86015d504c1a893b8b77d41c804fac4c1ef22c5f