Merge 'develop' into 'amd-staging'

Change-Id: Ie5d2a66600ddedfa5d6dd5c716f92463143a5510

catch/hipTestMain/config/config_amd_linux_common.json

@@ -79,7 +79,11 @@
 	   "SWDEV-398980 fails in Stress test",
 	   "Unit_hipMemcpyPeer_Positive_Synchronization_Behavior",
 	   "SWDEV-398981 fails in stress test",
-	   "Unit_hipStreamCreateWithPriority_MulthreadDefaultflag"
+	   "Unit_hipStreamCreateWithPriority_MulthreadDefaultflag",
+	   "Disabling below 4 tests temporarily due to change in API behavior",
+	   "Unit_hipDeviceSetCacheConfig_Positive_Basic",
+	   "Unit_hipDeviceSetCacheConfig_Negative_Parameters",
+	   "Unit_hipDeviceSetSharedMemConfig_Positive_Basic",
+	   "Unit_hipDeviceSetSharedMemConfig_Negative_Parameters"
 	]
-
 }