Merge "Fix issue where clock inflation would fail" into oc-dr1-dev
am: 011ac1bb7c

Change-Id: I2c1685e78a2de37192eceff40d254546b37d7d5e