This change also gets rid of several compiler warnings. Change-Id: I23962edaadad18a6e0395d528af17b909dcf5dad
Change-Id: I7e9e6e5bc4486d8618d0213b112308c3d305c15e
Bug: 5058488 Change-Id: Ib12013f58afad957a8205b439f87480cc12ea06f