Merge "Use an original text for next force 7bit encoding" am: d72172d5 am:...
Merge "Use an original text for next force 7bit encoding" am: d72172d5 am: f61540d4 am: d65e5d7f am: e42327d3 am: 47fd1a95
Change-Id: I9ec36ef21f0ea2b195daa48154ca56fd6acd3d04