Merge fixes

Change-Id: I390240de34264f1806fecb09baa8beb44a57ba50