[automerger skipped] Merge "Fix Error Prone errors" am: 645ae56f43 am: 90d6707b02 am: 71d5f85ea3 -s ours
am skip reason: Change-Id I829373d41c97962fe2122ea74cef12ba342ac33c with SHA-1 5ea7fb7f89 is in history

Change-Id: I35c8c2785caddeab10e221ae84a3109a59750743