Merge "Fix compilation warning."
am: 5af0991

* commit '5af0991bfce1695818c76ef3db2c36cc609f4980':
  Fix compilation warning.