Merge "GuidedStep API review change" into mnc-ub-dev