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

Change-Id: Ic9aa3a5d6b044de1697904466b16401518d11110