Merge "Fix performance regression of system_server boot time"