Travis CI updates

Change-Id: Id01fbf16a15e0fdbbc90de73b3a9374d514921e1