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

Change-Id: I7e85179f18cc445b1cbcebbec62fa3149817a643