Merge fixes

Change-Id: I8a772e207f64a61f0526e7afd347d52ecc4acf13