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

Change-Id: Ifa5bebb1e0a14dfed16958a0710a7232db9755ff