Merge fixes

Change-Id: I5b16070e710c1c6fdbcdad1ae20405bbb26c7f96