Correct PR 2203 for Android