Merge "Fix Error Prone errors" am: 645ae56f43 am: 90d6707b02

Change-Id: Ie41cec5e38a8c7c6334ff0fc89f26e5f2680ecc0