Merge "Remove am/wm.proto which is redundant. The naming convention is defined...
Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev am: 32ca41d0
am: 48768689
Change-Id: I0e93606474636cd9c75607631cfec1924442bd69