fix up AwesomePlayer

Change-Id: I63b79f0ef9bd7379256887b004aaf8f5a84e3aca
Merge "fix up AwesomePlayer" into jb4.3