Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev am: a15c471ee5 am: 1da31b6f8b am: dbca980a9f
am: 7794789ef3

Change-Id: I4406dda8f7e8372cca8bb22e438315066b6f9bef