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

* commit '6d9b3b69059a2d683ba6cda24db84b6cc92b2978':
  Fix silly gcc warning.

Change-Id: Ica8e35871046388d396cc652ec2a1fae951cf4bc