am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for...
am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev
* commit '039fd00f':
Manual 'cherry pick' to fix CTS tests for MediaControllerTest.