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

Change-Id: Ifb99a846c309f83f5d31cc81a88ca339787cf68b