Merge "Revert "Generate GuidedStepSupportFragment"" into mnc-ub-dev