Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev