Merge "Consistently use CLOCK_MONOTONIC for timing encryption"