Merge "Fix duplicate and dangling rules" am: f9f8b21af3 am: 50d2ffdfe3 am: 348d20bcce
am: 5cc452de64

Change-Id: I9779824859684b06476f1249f6c74fafbf3eaf4e