Merge "Indicate that a packet was truncated." am: 046160959c
am: e76c8020ba

Change-Id: I24adc5cda36ba74afa2bda3e86e13af834b15a2c