Merge "Address Error Prone warnings." into nyc-andromeda-dev