Merge "API council requested tweaks to SystemClock." into pi-dev am: 0bff5a6dfa
am: de5b4f3c99

Change-Id: Ic19a334c177c4eaeb3882479f6e5fcfb8644a0fb