am f05cc659: am 74e984f4: am 875dc8af: Merge "Increase deqp inactivity timeout to 10 mins" into mnc-dev

* commit 'f05cc659f473da2c6f563aecb3e3d7d7341cc87e':
  Increase deqp inactivity timeout to 10 mins