am 691a3191: am 5f68f717: Merge "Strip names out of externally supplied...
am 691a3191: am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev
* commit '691a3191':
Strip names out of externally supplied WorkSources to WifiManager (b/10710007).