Address comments on previous CL

Bug: 111407253
Test: build, boot, play some files
Change-Id: Iba77e07057ae62af117ff78d8d67c0f830572cf7
4 files changed