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

Change-Id: Ia87d6fc06ca38466538ef017063c49c025476adf