Merge "Fix issue with compressed smart replies." into pi-dev
am: 895ed11d03

Change-Id: I7743b004a7ddc9e46f3366f7c15058aad12686c4