Hide more warnings

Change-Id: I6d7876b302edde0ec6de6b03b8aa71cdfff86a80