Merge "DO NOT MERGE: Remove test for none public APIs" into pie-cts-dev