Merge changes from topic "GameDriver2"
am: 44ab00de7f

Change-Id: I4ffdd92469ccd67907a169bead5d1473a5a6777c