Fix security vulnerability
am: 2ae83f4f62

Change-Id: Ie0590dbb8429b5b289f3095055abdc8d29b95a7f