[OS-BUILD PATCHv3 2/3] Merge branch 'os-build' into 'configs/2020-06-04/arch/arm64'