Merge changes from topic "GameDriver3"
am: 5d832d2988

Change-Id: If2449acb0eef75ad81d913ab8fc07ae927f2ab8e