[Updater] Merge by SHA instead of branch am: 66479dd6f0 am: 40f1bbfb50
am: 3df5036919

Change-Id: Ifc88b7805efb845568755ebe6d3c56d3168e1455