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

Change-Id: If17846bcd43ace216d74e06b3be78d6a5e4453af