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

Change-Id: I02acb1fbb2cfaec2ce86ef1b485c0f97d1cf26dd