Merge "Sometimes no audio output after playing some clips using Files.apk" am: 80a288ad82
am: 68e6412024

Change-Id: I5e08efe9101e8581156310d0051ee76d645679be