This is a cleaned up version of the pull request below, which will be merged with this change then applied on top. https://github.com/google/ExoPlayer/pull/1490 Issue: #1246 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=121926682
