am dcf03845: am 718f0835: merge in KQS81M

* commit 'dcf03845abdc309a3660985cd00222d38e66ac60':