Also saved/restored location #FF

Change-Id: Ifbccd13d88da7218396ca381ea71510883048113