Fixing bug in security vulnerability patch am: 1e6d4bfd3e
am: c18ffb3bd3  -s ours

Change-Id: Ia60a2fc52345b6f6161b181ef48a9650516b16a4