Merge "Remove bug_1573141_fixed"