Merge "Remove dumpkey build guards after completing code move."