fix build after merge

Change-Id: I6f5bcb6ac11c0726e312021146c9f378bc0010c5
1 file changed