DO NOT MERGE Fix for CVE-2011-3919

Bug: 6086504
Change-Id: I9c5c9868ff4c2fe89f3dabb3267f07d3b67c1b00
1 file changed