Merge remote-tracking branch 'origin/master' into 6.0/stage

Author: Prakash Surya

lib/common.sh

@@ -1075,9 +1075,8 @@ function get_kernel_version_for_platform_from_apt() {
 	# available, it is not always the case.
 	#
 
-	if [[ "$platform" == generic ]] &&
-		[[ "$UBUNTU_DISTRIBUTION" == bionic ]]; then
-		package=linux-image-generic-hwe-18.04
+	if [[ "$platform" != generic ]] && [[ "$UBUNTU_DISTRIBUTION" == focal ]]; then
+		package="linux-image-${platform}-lts-20.04"
 	else
 		package="linux-image-${platform}"
 	fi