Merge "Remove automatic rule icons" into oc-dr1-dev
am: 0ed32cae99

Change-Id: I195fbd43befb0945fe0db6ec891a1781a3f31119