Merge "Fix duplicate and dangling rules" am: f9f8b21af3
am: 50d2ffdfe3

Change-Id: I20b39bbaf3ba642b10f4364beb4b580d2a5a7ac1