Sync to DEV_TOOLS required for TRAVIS build
TRAVIS build changes
SYNC DEV_TOOLS