Merge fixes

Change-Id: Ia1426ef17f691f8c98cc763bfb9156eb158c5451