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

Change-Id: I6f4f7670d9ffcb2d1a1775d7744b4421a46c19c4