Merge changes from topic "engine_vts" am: e672361d07 am: 43837ca0f4

Change-Id: I23e3210bab69ae8567ea5abf3c6016a113bd8c5c