Merge "Remove unnecessary files from target test env" am: 30b72dca61
am: f06deab0de

Change-Id: I6c089879ecf2376e968751df24287190c2759646