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

Change-Id: I28ee37f7842e6723deeac029ee3a60a43eea811a