Merge "Add vnod." am: 2b33e46593
am: 0e1913f4ff

Change-Id: Ibea28328b1267cbcf7a326ace2c448f8a2b6b792