Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"