Reconcile open-source froyo and Google-internal froyo - DO NOT MERGE

Change-Id: Iac3c5a0ce50330a29634f36ef7408a669d5c110a