Sync with Samsung sources update9