Merge "Respect restoreAnyVersion=true in full-data restore path" into nyc-mr1-dev
am: cef0c6b5a5

Change-Id: Ia5507eaf4a1f0ded5ad26e08ee5ab52528ff02f9