[ Merge of http://go/vwvgerrit/147459 ] Bug: 222355942 Bug: 166849552 Test: GtsMediaTestCases on sunfish Change-Id: Ia14cad535425af814927b14df8f1ee839ac7dee2
[ Merge of http://go/vwvgerrit/147459 ] Bug: 222355942 Bug: 166849552 Test: GtsMediaTestCases on sunfish Change-Id: Ia14cad535425af814927b14df8f1ee839ac7dee2