[automerger skipped] Merge "Replace HashMap with ArrayMap for services" am:...
[automerger skipped] Merge "Replace HashMap with ArrayMap for services" am: f0d921c4 -s ours am: e15d29b2 -s ours
am: 72365384 -s ours
am skip reason: change_id I092c6816afba77fde4195c68a211804d4a561b77 with SHA1 1901a5b4 is in history
Change-Id: I124d82f0e19737ebfd3e4d125dbc1f2078bacbe8