Merge "Log key import, generation, deletion for NIAP"