Merge changes from topic "GameDriver"
am: e10cb9bd1c

Change-Id: I4627c998da042bfab14769455c874aae2e19b91c