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

Change-Id: I17dddf43347f90d3029c47cb54b5f2328892e8c7