Fix test compilation

Change-Id: I266d256f131ed0c19fe61bbfb6d3a2da333a5ba7
Merge "Fix test compilation"