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

Change-Id: I3f3bbb75a1565880f846321bb3aca04e9644990b