Test: test/run-test 595-profile-saving This reverts commit a867f7ab. Change-Id: I2826bdddda446925856991de4b0b786c8c05831e