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

Change-Id: I41aff62920c9dd772ab4df7b970a339b1d2dd915