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

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