Merge "Fix errorprone build"
am: 3abddeca75  -s ours

Change-Id: I9eb51d858194869763c94260beeec05aac6578ee