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

Change-Id: Idb6fa3b3a0ba1518e9e4c4d591775d4a77e9a15f