Merge "Try to set the hop limit to something suitable for 64share"
am: 666bb5cf28

Change-Id: I4d3dfd87d8f3f6d699095e0ae8be0ed021382d54