Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1
am: 644e290d2d

Change-Id: Ib79a95d6a727ff9eb7af56ef9b6cda69c5f1dd99