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

Change-Id: I508258ad8bbbfffc85dd0c60d5a9a909f26f224a