Merge "Refactor and improve LegacyFileAccessTest" into rvc-dev am: 8f677825c9 am: 826a176bed am: fe5f1c0510 am: 850bd24fc6

Change-Id: I3d9e236d17a38f4c4245a24f1bb4669b7a51499b