Merge cherrypicks of [2549122, 2549155] into oc-release

Change-Id: I4bea635e9e668a766a611c1266effc0aa659304c
diff --git a/Image.fit b/Image.fit
index 2a46ce9..e77970d 100644
--- a/Image.fit
+++ b/Image.fit
Binary files differ
diff --git a/Image.fit.kasan b/Image.fit.kasan
index 7b8f417..6581f4c 100644
--- a/Image.fit.kasan
+++ b/Image.fit.kasan
Binary files differ