Bug: 136119370 Test: GtsMediaTestCases Change-Id: I37982e77deff5e2ac21c2d1a5bdf07b1d1f08b15
d099321312