Merge "Revert "Add arbitrary wait to allow request to go through"" am: 10567cd867 am: d1c4d27c83

Change-Id: I590cefdcc166f3f12f690a56d0e2ef90423559b7