Merge fixes

Change-Id: Ifc897e0e92b216bebd6edc68a2356e0d5293c852