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

Change-Id: Ic455b7621122709e009b62c258513b666c5d947f