am 170bf8ee: Merge "Fix build warning." * commit '170bf8ee9a4f3df4515bd663def26cd721450012': Fix build warning.