Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev am: a15c471ee5
am: d05f826739

Change-Id: I3ef288e0770b0f2967c48e73aec2a08aa1fe0ccc