Merge cherrypicks of [3783728, 3783729] into oc-m4-release

Change-Id: I889f13a1cf509c6ed683d2b16880309a1ebbae02
diff --git a/Image.gz-dtb.kasan b/Image.gz-dtb.kasan
index 1e34f97..0705924 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 160e0cf..948e6ec 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ