Merge "Propagate failure of MetadataBuilder creation in CreateUpdateSnapshots" am: afb6b354a9 am: 23d4c35a72

Change-Id: Ie59f1fd89adb3332998ef69d4d77eefdb5904a8b