Merge "check if uid=0 before attempting remount"