Merge "Fix double-add of calls" am: e8a5b8a76d
am: 811338631d

Change-Id: I71684a57715b59bd851df71b846d4905c896cba2