am 2f2a15f1: Merge "Fix build warning."

* commit '2f2a15f1c7d17e0186ca50225397b0c22d089803':
  Fix build warning.