Merge "Get rid of manually generated IKeystoreService in wifi/keystore"