Merge "Initialize |sentBlocksCount|" am: 3cd4ca85fc am: 5574280784 am: 519b9f9e92

Change-Id: I2ab2be5a58b4de5621121420f9f9ad4a9a8db1ed