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

Change-Id: Iab3c784069450d7021b7baf12bd0e16b23296d2f