Merge "Some clean ups to the updater" am: 52e61f6995 am: a0c0e04163
am: e89cfb6a41

Change-Id: Ia233f613e14c3902aae49347a001fa0b83250dd1