Merge "Clear some random compile warnings." am: 8d7d4479a5 am: 2730c60fde
am: a92a6bb33e

Change-Id: I631b68d218982fd20e79c9be9378accfa5b1a6fc
tree: 4b69ea5a545a95f5d41358c631bb408ae73315d6
  1. tests/