Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev