003a756974
This is the work around for the surface request race condition. Change-Id: Iaf8be12cfe4eb70d0a309ad875f38427181ac4b4