There may be vendor extensions to the system image which would need to use these IDs. This reverts commit 41986a01. Bug: 110856218 Test: these tests