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

Change-Id: I7c365f5f22927382788cbe7ecc4383af6565fa65