Merge "Simplify SystemClock and FakeSystemClock"