Merge "Make the text image readable under recovery"
am: d84922216c

Change-Id: Ie503be8af3d70e0c7cfa1646b47e35832c34e717