Bug: 78791811 Test: compilation Change-Id: I48404342daaaf74d81386aa64cac99ae1a5dfa8b (cherry picked from commit ef44f95c)