am 5c362d45: Merge "Fix build warning."

* commit '5c362d4573d8c852855e3d769c4add282a27f6d5':
  Fix build warning.