Fix in one place, ignore in the other. Only 4 warnings now. Change-Id: I3c745914e2ffdcdd7e70d9e06ae1df05dc120f79