cleanup from samsung merge, part 3

Change-Id: I2b726ff09cebbe66eefb6221c16be4ee5f8c3706