Merge "There should be an UNKNOWN state to handle more conditions" into qt-qpr1-dev
am: 2f79f57d66

Change-Id: Icb55fb5bc0a8df7e0f7325093fdf3b9bf1a5ce0f