Merge "Only insert CREATION_DATETIME for KeyMaster"