[automerger skipped] Merge changes from topic "upstream-vts-v6" am: 460be58661 am: 384a44b838
am: f22cc29da9 -s ours
am skip reason: change_id If0d330881901908e546baab89f63d3333003e355 with SHA1 5b8fc1298a is in history

Change-Id: I918441638e0071a1b85ae9ab9e267d5159b59670