am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev
automerge: da6ebb4

* commit 'da6ebb4ee29fff8b5455cd8b779aaabc029cd3b5':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749