Ignore changes merged from the previous maintenance branch

Change-Id: I16a203db76fd6dc7e091a2b2708f80b9d4cef079