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

Change-Id: Id1522c3a133f8e7234e6fc8dcbf1e480a7d8a617