am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1

* commit 'c697ebfdd671c7f4cf338d601917de16d2f1f135':
  Enhancement on ICS data stall polling logic