Merge "composer: rename ClockMonotonicTimestamp.timestamp"