Merge "Fix compile time warning." am: 5c6e4acbe1 am: 317da495e0
am: abc8d2d1fe

Change-Id: Ia1371744ffcc6bbdb14c836d72a84d45e5cc1b94