tree 064783e6132ec222a1f731b475a19fbfeb9f1321
parent 4f37a5e2683b3e5b248a344765d1c6ae421c5ea6
author Sunny Goyal <sunnygoyal@google.com> 1575932156 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1576099378 -0800

Updating some non-final static objects

Updating various static objects to use a standard pattern so that
it is easier to track and cleanup those objects

Bug: 141376165
Change-Id: Ia539cbfa338d544dddad771c5027b6748762768b