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

Change-Id: Id494550276503ba819e6a7fad45c385247c473f7