Fixes: 37469823 Test: Ensure no compilation failure Change-Id: I37ae54bbf05f4434eddbc13b0064ecfc99f69b8e