Merge fixes

Change-Id: If0556aa981e19d91f32a4d3ef83cb8bb045db3b7