Merge changes from topic "engine_vts" am: 24a21c1b53 am: eb3c4cbe0b

Change-Id: I16334e414880f12721d04abcaad5dc9e76f6e613