This change also gets rid of several compiler warnings. Change-Id: I23962edaadad18a6e0395d528af17b909dcf5dad
Bug: 5095140 Change-Id: I7000f752bc9b7fd6a7af4839b2f225c085300128