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

Change-Id: I72825244a16f4d88e8acd1e69e045859ef3a8acc