Merge "Removing unused rules."
am: 2b2c74f880

Change-Id: I00841b24d684efe788e7794038f98da55d4c75e9