Merge "Use an original text for next force 7bit encoding" am: d72172d5de

Change-Id: Iebf62e4fc4f8618e3b92fd79de527bc70972ddaf