Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev