Merge "Remove AOD clock combine call to improve perf" into main