am 60931a78: am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

* commit '60931a784ff5c7659a432ed7b4f5ea5a22156637':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second