Merge "libsync: Replace inserting tuple into unordered_map in favour of pair." am: 0617179c8c am: 32b3c649f5 am: 2a75fa607a
am: 3185d5f693

Change-Id: I6b678ccdfa2035b4a78304a59afdb53ae6b23172