Merge "audio policy: workaround for truncated touch sounds" into nyc-mr1-dev