Use PROTO_CANONICAL correctly.

Bug: 54955
Change-Id: I9223b790cc75f22fb46c05c10af9766fdaf836e7
Merge "Use PROTO_CANONICAL correctly."