fix mis-merges

Change-Id: I254a6153936c7b2d649cadabeaa4e4e60984b904