Bug: 30681771 Test: compiled fine with proto changes. Change-Id: I5b4669d13d58987c12dcc78ebdc4d7bd22916a71