Merge "Disable DoNotCall and AlwaysThrows"