Merge "MediaTesting: Add Writer Test" am: 3288ea49b1
am: e51884574b

Change-Id: I22bd075e0b83501a18ab27889317b1de5733ff91