Merge with Samsung sources update9