Merge "Handle large audio lost" into gingerbread