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

Change-Id: Ic714c604abcac7e82f38c0c8d4a99e5eaf06e4da