Merge "Dynamic insertion of pubkey to mac_permissions.xml"