Merge "updater: Fix the operator order." am: 2bb3a2270e am: f7f3f821a8
am: e97575e7ae

Change-Id: Ibfdda0d1ff43a0143acd8fd60c911f18da9f00a7