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

Change-Id: I196fd0217bab12995629f397bc33c74a6e4c3c88