Merge "Replaced zeros with UserHandle.USER_OWNER"