Merge "Remove two macros" into sc-dev