Merge "Fix caption text being cut off when text size is set to very large."...
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev am: cf988e3d
am: f1c69ead
Change-Id: Ib00c8325f8dbf5b54c8ab00b43fe42eccc89ccf0