Merge "MediaTesting: Add ID3 Test" am: f25ccd9e4d am: ec89acc006 am: 6eb998a439

Change-Id: If4a94193ea8ea446b96bd745d05a49218b80aeff