AV: Squashing errors

Change-Id: Ic90239a1132bf0fb1241164c482a5c25620d8774
Signed-off-by: Evan Anderson <evan1124@gmail.com>