Merge "Fix Error Prone errors" am: 72acd372b2 am: bbf2f80c02 am: 311b4e40df

Change-Id: I37c3d645d88c7c8a0b68b657b8699864d1801e20
tree: de4f2a8df82871e84112f4b077b82e81d79ca516
  1. tests/