am 60f8349b: am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom...
am 60f8349b: am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '60f8349b':
Followon fix for 14276128 Clipping at bottom of TextView