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

Change-Id: I11edfbbcd50b664e3b970aa443fb5eb186588e64