Merge "Assume ONE/Z71 device maintainership" into froyo