Merge "Fix warning from clang+mingw" am: 7fce15dc5e am: 31bcd7acea
am: e2a0c1d062

Change-Id: I9212bf71035641d5efedf8f06627a62e9694806c