Merge "Correction the use of SMALLER_FONT_FOOTPRINT"