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
Bug: 141376165 Change-Id: I2b49d53a05a04c622ed5a7b723109a6cc230d230