Updated _trackMessageSize based on latest upstream version (#12468)

Change-Id: Ie7db27a026d52befe027ed2abb96e62947f8116d