Merge "Keep spans while transforming to uppercase" into oc-dev am: cd3f72d628
am: c6df994b66

Change-Id: I1503c0e669679d1e6c4d4b0ec3de3ca5303ef972