Merge "Add test config to memory_replay_tests" am: a88b7b14ec
am: 621cc04f04

Change-Id: I741f766efdd480a18082f073aea30c8c681f0494