Revert "Revert "Fix build""

This reverts commit 2c2292d3aad60f2b439ff93d16f9c1d9fdb23815

Change-Id: Ic527576f7d0a89cc7a1ce3382cd91e1e68672767
1 file changed