Merge pull request #11843 from shreyashah115/bugf

Travis fix for asset and delivery trip tests