am faa1461d: am ab4f3c60: Merge "Manual integration of I32a7b5 from froyo" into kraken