proto was merged in ag/26383954 Bug: 241805782 Test: atest Change-Id: Ic2e6bcb27aecc386582e6f268d3b4f40387f2742