
Merge: https://github.com/google/ExoPlayer/pull/3225 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=167502127
Merge: https://github.com/google/ExoPlayer/pull/3225 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=167502127