Remove warning and build error with MSVC.

Change-Id: I8eac2f5ff08968a885a8e413bf4db38092036957