Merge "Convert the Underline and Shadow deprecated APIs to the new ones." into devel...