Merge commit '9aa0005e24e4da8004317cd1f632afb567c50ca1' * commit '9aa0005e24e4da8004317cd1f632afb567c50ca1': Update getDisplayLabel() API to support new types.
Merge commit '9aa0005e24e4da8004317cd1f632afb567c50ca1' * commit '9aa0005e24e4da8004317cd1f632afb567c50ca1': Update getDisplayLabel() API to support new types.