8b1590e582
This fixes timeout issues. Bug: Issue 8314 Change-Id: Id5c6a522b5df791ea715ad2dfaeefc05bb4da75c (cherry picked from commit 0385951355b00370747985a566c6c0291fcada77)