[Updater] Better tolerate bad config am: 904d20877e
am: 3d655fce78

Change-Id: If76780f716a36a9214f0c38adbacbf3d897f9748