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

Change-Id: I7b7483de2ecc212df6904f92b2817370b983a1c4