Do not use port 9200

Change-Id: I31078fb8cb3d3c60fb6f33e8f8418cb51f46a601
Merge "Do not use port 9200"