Merge "Ease out clock translation" into pi-dev