Merge "Make restore validation fast by using a map" am: decda14f02
am: 2962054d72

Change-Id: I53a27dfb9a212646d27ff01960a49f040391d15b