Merge fixes

Change-Id: I945347feb8fdbf667407194a7a011fea31a93dd8