Fixes errors causing tox failures. Change-Id: I361ef791c0de1aac1304bb8ad979066400930434 Closes-Bug: #1468765