Merge "Use six.moves.builtins to mock open in unit tests"