Merge "z2: Update maintainer"