[automerger skipped] Timeout and delays for greenday tests. am: 1dc120bb am: a7a91a7f
am: 9f960e85 -s ours
am skip reason: change_id I505b44ba4ae9757b76bb7f368362bdd7dadf7761 with SHA1 e5a95691 is in history
Change-Id: I08532e130f3276069757f24fa37a712ec362cc45