Merge "AOD: Track missed AOD time ticks" into oc-dev