am 6ae30f98: Merge commit \'1eda8628\' into honeycomb-plus-aosp

* commit '6ae30f989d8da512924e954be4e7ef692d2b9a18':
  set ID back to honeycomb       (please do not merge)