Revert "Revert "Performance regression when hot reloading""

This reverts commit 683379d6b8dc8eceb40c4b61622d85b679983129.

Reason for revert: b/146585515

Change-Id: I8cd03418c51e4dcacd292273e98198c335b865cf
1 file changed