Merge "AOD: Anchor clock at a third of the height" into oc-dev