Merge "Fix Error Prone errors"
am: 72acd372b2

Change-Id: I3c095bc457071fd46ffb1b5566c5d26fdca01a95
tree: de13f096ddcbfea8a7d502f10c77ee2fb4a7e6ba
  1. tests/