Merge fixes

Change-Id: Ia9ecfccd459622dc153658e36fab0cd42b06006a