merge fix part 3

Change-Id: I32de256677ead0c95f7cb4400b613e5defc00d03
Fix build

Change-Id: I79faadef8ad648b7715742059e22d51290a42e79