am 3c6256f6: am 6db3ad50: merge in KQS81M

* commit '3c6256f677fdd6270c43b00701f90c53e055f303':