Merge "Fix silly gcc warning." am: f7cdec5
am: 2901872

* commit '2901872d93275350b89434a3ea7884f4f8d53030':
  Fix silly gcc warning.

Change-Id: I19a70f5f8f6e1a4e2093a47418a03c75fbd0109f