Revert "Merge latest from spark:master"

Reverts lono-devices/core-communication-lib#2