Merge "Clean Up tmp file from tests" into oc-dev
am: 87602ab548

Change-Id: I3113353eb13067f6f7277b7e6b1e42321f313240