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