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