DO NOT MERGE - fix truncated boot sound. am: c6effa90 am: 21d78e0f am: f781f952 am: ef2da1d7 am: ea95e74c -s ours Change-Id: Iadcb9d9bf0abec3e4db860086ca1897b7503da53