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

Change-Id: If25634c6867446c79735a433a2238aebfde72b34
tree: bdd02bbcbe449ef0210a6bd8605409964bd8aa7d
  1. tests/