Merge "Mark more directory getter APIs @TestApi" into rvc-dev am: 5ac047d365

Change-Id: I673ffc5f097b6ca5083a8ac8ac4360b39c748151