Corrected merge problems

Change-Id: I165f616acf2f56b4ada9242eeda7aff409c87aa2