Merge "Clean up ID3 unit test" am: 0a614efc70 am: 81ec37608f

Change-Id: I79547e03512243abc5e008881c6c7eac27d13883