Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev