DO NOT MERGE - fix truncated boot sound.
am: c6effa9014

Change-Id: Ibb6e2a2789c3bbdf0b3f476a980280998536689b