Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev