Merge "Fix silly gcc warning."
am: f7cdec5

* commit 'f7cdec554371aad9dd8f40c6cd195a5635abc3d6':
  Fix silly gcc warning.

Change-Id: Id962ef258d4faa8f6362f9e9e3774f308dd5043f