Fix Error Prone errors
am: 3aa3fb5e73

Change-Id: I5e5255640b63f8d20fa814242f4c6cdd32d3d99f