Merge "Reverted "FOR UPDATE" in 61f246aa786d824d0653522ed679c16be719da80."