Fixing bug in security vulnerability patch
am: 1e6d4bfd3e

Change-Id: I7f603c34b5c3187d7d1b6dda12e4a3a87fa0e653