Merge branches/froyo_12.03 to head.