Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e
am: 062a2cffb3

Change-Id: I4673e6b160fcf9e2b6069af91eeae97d4e4a17ed