Merge changes from topic "vintf_rule_move" am: 3a28b07b43 am: 3801ff0db2
am: d8e00ffced

Change-Id: I9664c959ab5a6ac28a61ffa22764b524dd611a83