Merge fixes

Change-Id: Ibefd171a3a7a9bc796a46e7a984a8f4218c98c44