Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: 17f4b85725

Change-Id: I802d25a18c01dd363636e88157fa223143e70dd6