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

* commit '6da062a96c6f8126aad450a937144fab4333488f':
  DO NOT MERGE: Clean up USB notifications: