Remove cherry pick's

Both of these have now merged so we don't need to cherry
pick them anymore.

Change-Id: I1f1e673bd1e2bed03ddf881fbb451b06d5cb0df4