Merge "Fix AOD battery updates"