Merge "Test: Save SSR dump after test" am: 6fe24ff128
am: 32d809cd22

Change-Id: I2d33538698728eb96b6517ef0cbd72fc49fde0ab