Merge "Fix errorprone build"
am: 0bed3cacd7  -s ours

Change-Id: I3c6b80920db044b842946e373dbc1efddd260de8