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

Change-Id: Ic7cf84ebb2d054b73641fa98117da356d254ee67