Merge "Add arbitrary wait to allow request to go through" am: 36e1106b71

Change-Id: Ic9ccf7c3f49474acb74d6ab62ea45d9d906c7f38