Merge "Fix Error Prone errors"
am: 645ae56f43

Change-Id: I1e6dce4dd5458c01753ad78064ac6ea0e710f1ef