DO NOT MERGE - fix truncated boot sound am: 75bf3fd73b
am: 322f13a8ff  -s ours

Change-Id: I8041b3a904f71bf54c7b79d7072ac0a3798fa646