Fixed travis-ci branch

Change-Id: Ie1125c0cfecb015d2ac31277a91dea4a5c76e58a
Merge branch 'hotfix/travis'