Merge "Renamed variables to not match a restricted identifier"