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

Change-Id: I59856f5181e27b1810d49d9e49a450c51703f3df