am 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '07a8778b560ce8d46bcf5aad012be575f3a90500':
  Update networktype before sending state change.