bb0f554148
This is make it easier to create factory classes for individual when adding more injected parameters Bug: 361850561 Test: Presumit Flag: EXEMPT refactor Change-Id: Ie68e9e24aae801b7fed14d1b03df760e5b67c183