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

Change-Id: I2dc3f0daa42e7db8a063240e9e8cba091fc86757