am 70358dc1: am 3c6256f6: am 6db3ad50: merge in KQS81M

* commit '70358dc16401bd3fbbc5e7399ba7fe61c54556e1':