Apply fix for Bug 897611 to galaxy-s2.