Merge "Full-data restore path needs to pass along the widget metadata" into...
Merge "Full-data restore path needs to pass along the widget metadata" into nyc-dev am: c7656ffc am: 5a4db8e2
am: 76eec473
* commit '76eec473':
Full-data restore path needs to pass along the widget metadata
Change-Id: I7f98d8d2c0362e8288feac871ae432c15aa07af9