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

Change-Id: Ied58b3e7c3b19d687048d880d9517f0beea73a10