Merge "Fix recovery of stats data from previous input while using ProtoOutputStream" into pi-dev
am: e51af37475

Change-Id: Ie926e6d5d83ef8064de424764c6baaf522848c18