Merge "Reducing CPU impact of non-monotonic clocks on Gc."
am: fc19c53041

Change-Id: I1405dee17b2e0507b026b079b57875c2eb4f5cad