Bug: 32313592 Test: pass (end to end for others in topic). Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28