Merge "Removing unused rules." am: 2b2c74f880 am: fb5495e1b1 am: 0d8be8c03b
am: 77fb2b861b

Change-Id: Iac214dc09c2790f6684b5ee2331cf2ce7bfd5ac3