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

Change-Id: Icfb635818b1a9e908f9109af62631940c75369ae