merge fix

Change-Id: If567ad20c9bfbe93da8ea73a4e36b46a62280474