[automerger skipped] Merge changes from topic "engine_vts" am: e672361d07 am: 43837ca0f4 am: 43e68a084e -s ours
am skip reason: Change-Id I5774597e252261d8369cd7dc3cce9bb7056e1569 with SHA-1 8475ae5dbb is in history

Change-Id: I76c691ccb923626ac96105aca249e86b245c31b9