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

* commit 'abd0f1de204f5214170240ba3586f0a398aa4039':
  Increase polling timeout