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

Change-Id: If757b72450a6fe2d5995da0f1a22dcb965f8056c