Merge "AOD: Fix AoD time tick after refactor"