am cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread

* commit 'cbf0983ec97879026e87fa97ff0b5c8786bfc8f8':
  Final final final Gingerbread MR API changes.