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

Change-Id: If8e0edfd2f1e1aeaa0831863fb2cd6b83a252083