Look up proto type definitions separately am: 9c93e69a4f am: 35c1d539dd

Change-Id: Ie98832e9fa7e6ac0d56562504dc75c17165130f4