merge fix

Change-Id: Idaf926d01bd253731b81289494405edc9a5cd153