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

Change-Id: Ib017fd53fdb728c388c3d6f209c92a5c6931f7ad