Use Map<K,V> and List<V>. Bug: 192615532 Test: m Change-Id: I5ad7f67b4b08b646362a58214c3b62cd1ada28c0