[automerger skipped] Merge "There should be an UNKNOWN state to handle more conditions" into qt-qpr1-dev am: 2f79f57d66
am: d2db185f20 -s ours
am skip reason: change_id Ic184b8f30c9e40c14e6edf92cc63b5b2a82be68d with SHA1 aa2004b436 is in history

Change-Id: Iedc0b9bd4574b4978e884dc92417486acaead916