Merge "Merge "Avoid setting class/method when testPackage is set" into oreo-mr1-cts-dev am: 2a38c53395" into pie-cts-dev