Merge "Remove code that overwrites ClientModeImpl log record size" into sc-dev