Merge changes from topic "vti-impl" am: 3b65c7ad25 am: b5b1e1af0d
am: 34e98e824f

Change-Id: I41758313739455dc519009e03a7a19ccfcda7abf