Merge "Remove an Android change that is causing a test to fail"