Merge "Mark more directory getter APIs @TestApi" into rvc-dev