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

Change-Id: I9a13cdc9597f1d4ffdfeec66ff99e4b083d29fd9