Merge changes from topic "GameDriver2"
am: a88226283d

Change-Id: I632eae432db8490ae78d32b245717a6ab0861f8a