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

Change-Id: I5b7d6247342eaddb8024842cecfc516ae2aa5fcc