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

Change-Id: Ic1a179fc368589bb47ae06e4f9760889cfb050d2