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

Change-Id: I0770f7552d1fa9578824d1bb342e8021b3bb089f