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

Change-Id: I9ea3328033c9d168115499383156b682ae9cb9a8