am 52c4c14f: am b9db9bb8: Merge "increase retry to have better chance for streaming" into ics-mr1

* commit '52c4c14f5daa0c311f8d24b7e58f97806936ffd3':