Merge "API council requested tweaks to SystemClock." into pi-dev