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

Change-Id: Ic16f7486d6768ddd7e36e396321b8630bd9ad36b