Merge "Fix android Studio build due to  "@Subcomponent.Builder is missing setters"" into sc-v2-dev