Look up proto type definitions separately am: 9c93e69a4f

Change-Id: I9835533767e41d5f507290541e262162c4afa8c9