am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo

Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken

* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
  Missed these ones in the previous rename.