Fixing bug in security vulnerability patch
am: fd8d014e0d

Change-Id: I2c2c2fff90e4da65d50a19200c5643d612b711f5