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

Change-Id: If6aa57364f74e94f9460ef4190a9996fbdae600f