Add cap on number of calls stored in analytics am: d93b9ececc
am: 27a76bca29

Change-Id: I1b1ee393475c4c0b814360db6d366e1eece41906