Merge "Refactor update status management as protobuf" am: 5c63dc9322 am: 122035fd3a

Change-Id: Ia1021971d26541312ca9c9260495b13ce2c527ce