Merge branch 'vnffg'

Change-Id: I9d5b9beb6ded99c03816f6a3976f546b16ca6042