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

Change-Id: I9a995365cbbf354a8f3da09f1d900d9e52b5e4a9