fixes for merge fallout

Change-Id: I6831f2c7715ac1e7d0298422516426d89638336d