Merge "Revert "Lists returned from OS aren't mutable.""