Merge "DO NOT MERGE CTS: Avoid the possible race conditions on testing pip over app" into pie-cts-dev