Fix incomplete frame error Bug: 63522067 Bug: 64380403 Test: ran POC before/after Change-Id: If22f2ed8936e0ead9fcfa64ddde99e85c10cecd2 (cherry picked from commit ee0e003a0fd2280ecd0eeecd2e2f19250a96c3af)