fix these bad merges by me

Change-Id: I0a43928715cd5b11c72f38ff4bfd2b42f16bd78d