Merge \\"Avoid duplicate class for mark compact\\" am: 3fa401661e
am: 3fcf1ca753

Change-Id: I54f8559eb273270c25cdf6ab2992e4dcd054bb39