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

Change-Id: I17ea7953c28cf86cc9b35e7f972ee29e3a1f39b0