[OS-BUILD PATCHv2 3/3] Merge branch 'my-build-change' of gitlab.com:prauld/kernel-ark into my-build-change