[automerger skipped] Merge changes from topic "engine_vts" am: 24a21c1b53 am: eb3c4cbe0b am: 04728790fa -s ours
am skip reason: Change-Id I62730caadafdcb5ebb3083d683625424864afe97 with SHA-1 94865666a7 is in history

Change-Id: I9c6d71570a1ae12dff33cc49738953b4559acab8