Merge "CTS: update wifi scan timeout to 9 seconds" into oc-mr1-dev
am: 9d802bdf96

Change-Id: I63e93684c0ce201c445cd1dd2ebb8f41b1afa04d
tree: 0cf1db779e0f8612a48965cac2f542a3fad6cbcd
  1. tests/