Merge "Missing UpdateState::Cancelled string conversions" am: 962e3ddfd6

Change-Id: I679ee467be42ae1955992ff5f664cff8071d5d5b