Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev
am: 2880a4b41f

Change-Id: I1c114c411d97aba08ecfb390c28ceb18eee4cbbd