Ignore changes from open-source master that are already here

Change-Id: I5b560ab81c5188e6a28aa6feb0be13f970e0add4