Merge "Stubs: Disable Errorprone warnings"
am: 94d4d65137

Change-Id: Ib3b00fe39c40144f29dac3018d2463e3319353f4