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

Change-Id: I6240d88651abbd2172f18479545809212897d50d