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

Change-Id: I1dc8a75f5694349b58b2090c1e27b0182b84cddc