Merge Fixes

Change-Id: Ic573811ed49e7b9e7f0b4e9898684a0048f889d3