Merge "Track header file change."