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

Change-Id: I55b0d036290c92593e1920f337ecfe6213708f29