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

Change-Id: I52606e67b83bf61230aaf8089e220a7a4c0653c3