Merge "Fix compile time warning."
am: 5c6e4acbe1

Change-Id: I373ee400185ec1aa314a7908e9ca9c8ff5c336f3