Merge "Fix failing unit tests" into froyo