Fix for build

Change-Id: I0d414414d77eed20fe9feaf368e7ab8de56e6873
6 files changed