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

Change-Id: I12150e0f4a492ed76277d34a2a7e4a8614d6b3c1