Merge "Missing UpdateState::Cancelled string conversions" am: 962e3ddfd6 am: da06572d74 am: 4e5dbfbb27

Change-Id: I43ad7e3b6e2f081c2021b7d53717daf21a62564b