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

Change-Id: I4cdb17d4e87f9bc7151812663618bec22055083b