Attempt to fix TravisCI build

Change-Id: Id9b9c6037e980219af1f6cd536165942918cfcc1
(cherry picked from commit 826a3c1828c25aea515b40bc5786bfd4ece32c14)