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

Change-Id: Ic3b3ce30a29b967189fae95ec53f52569350fa82