Revert "Fix build"

This reverts commit 3fec769ca79a189e9508350fe91c86a65d4c343d.

Change-Id: I997792f64b0de9ee1a90f761ab17f620fc11eef5
Merge "Revert "Fix build"" into lp5.0