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