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

Change-Id: Ibb747b3b9248c246a991caf0e80e13449787a602