Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1