cleanup from samsung merge

Change-Id: If2aaabf14ae95d2514e77f6e951451ecd4646eec