Merge changes from topic "upstream-vts-v6"
am: 460be58661

Change-Id: I0be902d9c228cbcde9ffb130c899e72ea4ddccfe