Merge 9d342967 from master to r12. do not merge.

Fix broken equals() in new qualifiers.

Change-Id: Id083d11a2941d120ca6fd9438a5a12ed7502ab92
3 files changed