And a few other related warning fixes. Change-Id: I1a49b9ee04c2b1bf80bc943272f72ffd6de77ef6
Change-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9