Targeted minimal fix for security issue in CVE-2020-9589. Bug: 156261521 Test: If0722deb96def186fcd0a2d97e57647a1b5987f8 Change-Id: I380c158e465a995a5b0f88021cbf10bbf050db00 Merged-In: I380c158e465a995a5b0f88021cbf10bbf050db00 (cherry picked from commit 8051967ac143c7e07ee636315cee8b56874e22c3)