Fixed build after merge

Change-Id: Ifac89a70afa82047d97994860c6e58954f5d91d0
1 file changed