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

Change-Id: Id343220eb2339249817122ce8950a9c14ee5be5f