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

Change-Id: I7d8859456c069d0b1e329ecbb3e56ad38f6211e8