Merge "Fixed mUserId_shouldDeriveUidFromMainCaller test case fail"