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

Change-Id: I0232ccb918c5f037fb80fc43b20ea50987ce40b4