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

Change-Id: I4455b95acd7aed62d7ea57eb671a91e6a25d940f