am 209eff27: am abd0f1de: Merge "Increase polling timeout" into lollipop-mr1-cts-dev

* commit '209eff27552e1e185ea4bc19f066494e5c3d7ab5':
  Increase polling timeout