Merge fixes

Change-Id: Id92e61c89580fd9a289fd1aa2c751844832d1734