Merge "Ease out clock translation" into pi-dev
am: 255352437f

Change-Id: I8585652bf8c5dfd05c74fc0917dd883dc9475cd0