Clean up 4.4 merge

Change-Id: I3318c6558be31d19bfa2f8cdfedf1134601f9b0c