Update from Samsung Open Source

Signed-off-by: Salvatore Battaglia <salvo.96bat@gmail.com>