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

Change-Id: Ie93ae0764c46883c46f5d4f5a8996d57aa143b7e