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

Change-Id: Ibb5c891fe3c219d75be8c124c9be215a31b2a241