Merge "Add atomic method reference map"
am: 392fb010a7

Change-Id: I29b36b6868d52fb197cfcde7804fd417251a3238