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

* commit '523a129ced08a41468f3d52cf16ebb237f280e39':
  Use one method to change bounds in ChangeBounds.