Merge "Remove am/wm.proto" into pi-dev