am 2b05a95b: (-s ours) am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread

Merge commit '2b05a95bccafddac15debdfb5c39107aa3418783'

* commit '2b05a95bccafddac15debdfb5c39107aa3418783':
  DO NOT MERGE Fixing Connectivity