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

Change-Id: Ie92d406374ec1c335ecc12e32630772b7da73d62