Back out ea9e204bc97a for test failure on Android.
Back out 462fde31c880 for test failure on Android
Backout f53ad1a63b58 for test failure on Android