Fully address CVE-2021-3121 in the process.
Change-Id: I607c182c09a88a7daf1e4ffb67a28ab16d1f23ae
Signed-off-by: Mayank Shah <mayankshah1614@gmail.com>