Merge changes from topic "engine_vts"
am: 24a21c1b53

Change-Id: I5d66369c23ae9e146b6b5840f90433c72f6c2d45