DO NOT MERGE - fix truncated boot sound am: 75bf3fd73b  -s ours am: 37777e05eb am: d30707f77a am: b21257faed
am: fd1c6693b5  -s ours

Change-Id: Ief2865272be13ab4ad5abaa522356fb97adbb905