am 57c88834: (-s ours) am 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread

* commit '57c88834b7267381e8a6080e34971c37ea344be7':
  DO NOT MERGE Fix crash when device is null in Connection Access Cancel.