There weren't that many of them - just fix them. Change-Id: I6aa6d056746c4a6804146b89c12e6313f9d22d9a
Change-Id: Ibffab01bc835d380ca9f0c18521c8a6d808de761