Merge "Refactoring GuidedAction Builder" into mnc-ub-dev