Beginning to add the code to support FROYO.