am 1d2c25b7: kraken --> gingerbread

Merge commit '1d2c25b7804e6fcee213b5ed81594f48c563e2eb' into gingerbread-plus-aosp

* commit '1d2c25b7804e6fcee213b5ed81594f48c563e2eb':
  kraken --> gingerbread