Merge "Increase polling timeout" into lollipop-mr1-cts-dev