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

Change-Id: Id3ffc7581be638cd70bea4d2a61b4e0c026c57be