Merge "CTS error while media dump()" am: 5617fb288b
am: 1e216bc835

Change-Id: Ibd50eb3f30b842634f9d521b45014efda89a0b2e