Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445c am: a3a89a2c0a am: b6815a19d1

Change-Id: I711e9e385591fa43f84b7360a9a7f5f2e8c3bd91