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

Change-Id: I805646e465156b8914d5cfea89b176b531c50f95