Merge branch 'rewrite-apmanager' into merge-apmanager

BUG:23620021