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

Change-Id: I29284a6ead745182b80299f40c8a2794bb7b307a
tree: df7ac58a04468785ec9fad282b1326494213f12f
  1. tests/