Merge "Add const mark to const values in non-RD coding mode"