Merge "Remove unused global define RLH_FOR_UPDATE"