Merge changes from topic "engine_vts"
am: e672361d07

Change-Id: Ib5a5c38f7b52c2f8aa5032a8893915f7dd513ee6