Look up proto type definitions separately am: 9c93e69a4f am: f54a5caddb am: b2f1684a3c

Change-Id: Ia126417ddac6d4f0cea2dee5552dba6456ceee13