Ignore-AOSP-First: UpsideDownCake Finalization Bug: 275409981 Test: build Change-Id: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be