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

Change-Id: Ia689b382873f015af1b7b2d10630daee165aa264