Merge "Refactor and improve LegacyFileAccessTest" into rvc-dev am: 8f677825c9

Change-Id: I1bee354f5781623f49bb2ee411b70b8b21287607