support loki recovery

Change-Id: Ia425a5307c3f0ff341b0d6b5ea8b5f37802831b4