Merge "Apply correct restoring logic." into arc-apps
am: 9538e3f8e7

Change-Id: I580571325bcd921a51a423bac26ac32e23f4cd28