Merge changes from topic "vintf_rule_move"
am: 3a28b07b43

Change-Id: Ie1c8f1e584114940f70254419360e28435a1b241