Merge "Rename private fields to break bad code examples" into froyo