Merge "Fix 3201849: Remove builder pattern from DrawableHolder setters"