Fix security vulnerability am: 2ae83f4f am: 11ab5838 am: ac2b87ac am: 132d0f2a am: 3995674f am: c7892d9d am: cca3b79c Change-Id: I2e5da5ee33eb2757f360881e6ecc7dfd9fb67938