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

Change-Id: I5bf42b3675fb0b8ce78181c8760300669ef61c4d