Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread