Fixing bug in security vulnerability patch am: 1e6d4bfd3e am: c18ffb3bd3  -s ours am: 31629ba10d  -s ours
am: 488e02bff4  -s ours

Change-Id: I0820d5fad6b8cb8ed845ee5ec6cf453a75a26277