Merge "Track keymaster method changes"