Merge "Mark more directory getter APIs @TestApi" into rvc-dev am: 5ac047d3 am: 34ea510c am: ab22eef0 am: e1bbaf61 Change-Id: I024ffc84d64afbb509189b3e5bd25642565b6d44