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

Change-Id: If25e24771a7ec33681e2cc3c0ca210351e66deab
tree: 22dfebfc3a9aef1ec9fd12c52dd8efae7e2ca468
  1. tests/