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

Change-Id: I4cafef20f443adc11776587028b176dfcb75becd