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

Change-Id: Iff2e1d00b2ea91d1ee1fe992cf15ba8548bc35d8