Bug: 119669996 Test: Run cts CtsMediaTestCases Change-Id: Ib906cfaa6d5e1063db71c8b9a29c0404d6166b48
mentioned in commit 14d92b7e