Fixed use of message that does not exist

Bug: 55702

Change-Id: I8a2ca0899fb198d51be0aef5c719e8fce665b768
Merge "Fixed use of message that does not exist"