This is how this should have been done since the beginning. Test: build, boot Change-Id: Ifd795776c71a2e666da7fab90cbb3f356af93d4f
These always should have been in their own files. Test: build Change-Id: I201109b5ee63016e78901bbfd404846d45e1d4e6