Merge "Fix doc build of autogenerated GuidedStepSupportFragment" into mnc-ub-dev