Fix security vulneratibly 31960359 am: dffa078205 am: b8b076e553 am: 46dd3c89e5
am: 04f62d5b99

Change-Id: I6f28a439b03be3fc7151313fc4f963c532196118