Merge "Fix Error Prone errors"
am: 72acd372b2

Change-Id: I3c095bc457071fd46ffb1b5566c5d26fdca01a95