Also remove useless custom preference Fix: 36395109 Test: robotests Change-Id: I07297e6ade6991a8262473c9f59c21d914300244