Files were originally touched by b803fa25.
This is just a follow-up patch.

Change-Id: I1e35d5e3c3d193bb5dfdb4b743328d8d22466a4d