Merge "WifiServiceImpl: Clear identity before retrieving app info"