Fixed Bad heads from last merge

Change-Id: Ic03c0b667d7a26130cc0a03708fd9a4084cfeeb6