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

Change-Id: I5d85055d6231bf235e7dbc1f4c731aeef8a8fce1