This reverts commit b4c5318c5f. Original commit caused external_ui integration test failure on Android.
b4c5318c5f