Merge "Fix bounds calculation" into oc-dev
am: d1422b56ad

Change-Id: I302c46401b5251a0b82d0e704424bacd687893f8