warning fixes for non-MSVC

Change-Id: Ic8b788a1fd0c8e473ebb455240c10f9ca6bfd55a
2 files changed