Merge "Change key-set/public-key manifest relationship."