Merge fixes

Change-Id: I6ca23029614405a963a8ad58ee16b07b4fc88c87