Merge cherrypicks of [3215323, 3214370, 3207446] into oc-mr1-release

Change-Id: I099a71320b55163a9f2bc9088b3c5f3bdac55208
diff --git a/Image.gz-dtb.kasan b/Image.gz-dtb.kasan
index 419d30e..f378b68 100644
--- a/Image.gz-dtb.kasan
+++ b/Image.gz-dtb.kasan
Binary files differ
diff --git a/Image.lz4-dtb b/Image.lz4-dtb
index 4032e78..0e50e48 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ