Merge "Change KeyFactory context args to references."