Merge "Card mark holding class instead of declaring class"
am: 0ed44f9595

Change-Id: I6b4eeb9b956a6b5def8b28366822af4b0d44c686