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

Change-Id: I658b5971cd8a0e13f60bf44570218eab79e0f12d