Merge "Fix default value for mUidState.get."