Fix a hacking complaint

We can't land changes while hacking is unhappy.

Change-Id: I8ae913a965cd9be1fecec9ea960b90c8a69dca2b
Merge "Fix a hacking complaint"