Merge "recovery: Remember the last log position." am: d549616b24
am: 6691dacf56

Change-Id: If020fcbe02e879e96b1b6481c1aae4029785483e