Merge "Fix duplicate and dangling rules"
am: f9f8b21af3

Change-Id: I7da59735bf22dbf54cdadfb45e01e21693e4054b