DO NOT MERGE Fix for CVE-2011-3919

Bug: 6086504
Change-Id: Ib8d596aa7d4033b30b7f6468e9339c2aa9e11308
1 file changed