Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev am: a15c471e am: 1da31b6f am: dbca980a am: 7794789e Change-Id: I4406dda8f7e8372cca8bb22e438315066b6f9bef