The code can be removed because mvp_full will be overridden after that. Change-Id: I89559b1b6914c86bcd02b7359d37241948ac11d3