Merge "Adding policies for KeyStore MAC."