Merge "Improve error message when expecting a non-virtual autofill id."