[automerger skipped] Merge changes from topic "GameDriver2" am: a88226283d
am: 351e9a6bf2 -s ours
am skip reason: change_id I39724917b516b4871c6b1b1f0d30aa0f793942a4 with SHA1 2b3be86334 is in history

Change-Id: Ifc15844c4094c03989f201c5230e49296b6df4a3